From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 23 Sep 2015 17:59:23 +0000 (+0200)
Subject: st: Don't shadow existing variables
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1190
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a025b151efa892ede252af851a6d484fc8f0d8dd;p=gnome-shell.git

st: Don't shadow existing variables
---

diff --git a/src/st/st-private.c b/src/st/st-private.c
index f27955c8d..c842be0cf 100644
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@@ -383,9 +383,6 @@ _st_create_shadow_pipeline (StShadow    *shadow_spec,
 
   if (G_UNLIKELY (shadow_pipeline_template == NULL))
     {
-      CoglContext *ctx =
-        clutter_backend_get_cogl_context (clutter_get_default_backend ());
-
       shadow_pipeline_template = cogl_pipeline_new (ctx);
 
       /* We set up the pipeline to blend the shadow texture with the combine
diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c
index 7437fd05c..d71466c5a 100644
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -3016,7 +3016,7 @@ st_theme_node_get_border_image (StThemeNode *node)
           CRStyleSheet *base_stylesheet;
           int borders[4];
           int n_borders = 0;
-          int i;
+          int j;
 
           const char *url;
           int border_top;
@@ -3046,7 +3046,7 @@ st_theme_node_get_border_image (StThemeNode *node)
           /* Followed by 0 to 4 numbers or percentages. *Not lengths*. The interpretation
            * of a number is supposed to be pixels if the image is pixel based, otherwise CSS pixels.
            */
-          for (i = 0; i < 4; i++)
+          for (j = 0; j < 4; j++)
             {
               if (term == NULL)
                 break;